Autogenerated HTML docs for v1.7.10.1-456-g16798
diff --git a/git-config.html b/git-config.html index f01c75c..54f1600 100644 --- a/git-config.html +++ b/git-config.html
@@ -1149,8 +1149,8 @@ found at the location of the include directive. If the value of the <tt>include.path</tt> variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was -found. The value of <tt>include.path</tt> is subject to tilde expansion: <tt>{tilde}/</tt> -is expanded to the value of <tt>$HOME</tt>, and <tt>{tilde}user/</tt> to the specified +found. The value of <tt>include.path</tt> is subject to tilde expansion: <tt>~/</tt> +is expanded to the value of <tt>$HOME</tt>, and <tt>~user/</tt> to the specified user’s home directory. See below for examples.</p></div> <h3 id="_example">Example</h3><div style="clear:left"></div> <div class="literalblock"> @@ -2344,6 +2344,113 @@ </p> </dd> <dt class="hdlist1"> +column.ui +</dt> +<dd> +<p> + Specify whether supported commands should output in columns. + This variable consists of a list of tokens separated by spaces + or commas: +</p> +<div class="dlist"><dl> +<dt class="hdlist1"> +<tt>always</tt> +</dt> +<dd> +<p> + always show in columns +</p> +</dd> +<dt class="hdlist1"> +<tt>never</tt> +</dt> +<dd> +<p> + never show in columns +</p> +</dd> +<dt class="hdlist1"> +<tt>auto</tt> +</dt> +<dd> +<p> + show in columns if the output is to the terminal +</p> +</dd> +<dt class="hdlist1"> +<tt>column</tt> +</dt> +<dd> +<p> + fill columns before rows (default) +</p> +</dd> +<dt class="hdlist1"> +<tt>row</tt> +</dt> +<dd> +<p> + fill rows before columns +</p> +</dd> +<dt class="hdlist1"> +<tt>plain</tt> +</dt> +<dd> +<p> + show in one column +</p> +</dd> +<dt class="hdlist1"> +<tt>dense</tt> +</dt> +<dd> +<p> + make unequal size columns to utilize more space +</p> +</dd> +<dt class="hdlist1"> +<tt>nodense</tt> +</dt> +<dd> +<p> + make equal size columns +</p> +</dd> +</dl></div> +<div class="literalblock"> +<div class="content"> +<pre><tt>This option defaults to 'never'.</tt></pre> +</div></div> +</dd> +<dt class="hdlist1"> +column.branch +</dt> +<dd> +<p> + Specify whether to output branch listing in <tt>git branch</tt> in columns. + See <tt>column.ui</tt> for details. +</p> +</dd> +<dt class="hdlist1"> +column.status +</dt> +<dd> +<p> + Specify whether to output untracked files in <tt>git status</tt> in columns. + See <tt>column.ui</tt> for details. +</p> +</dd> +<dt class="hdlist1"> +column.tag +</dt> +<dd> +<p> + Specify whether to output tag listing in <tt>git tag</tt> in columns. + See <tt>column.ui</tt> for details. +</p> +</dd> +<dt class="hdlist1"> commit.status </dt> <dd> 